]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
NetworkAgent: use g_close() instead of GUnixInputStream
authorGiovanni Campagna <gcampagn@redhat.com>
Mon, 2 Sep 2013 07:59:01 +0000 (09:59 +0200)
committerGiovanni Campagna <gcampagn@redhat.com>
Mon, 2 Sep 2013 16:45:07 +0000 (18:45 +0200)
We created the input stream just to close the FD, but GLib has
a handy close() wrapper, so we can use that instead.

https://bugzilla.gnome.org/show_bug.cgi?id=707269

js/ui/components/networkAgent.js

index c83782f84eee3d84e2cb277e44a55369954137d8..189dc942c09957a9fb795f9825886a618f37e1c3 100644 (file)
@@ -380,11 +380,7 @@ const VPNRequestHandler = new Lang.Class({
             this._childPid = pid;
             this._stdin = new Gio.UnixOutputStream({ fd: stdin, close_fd: true });
             this._stdout = new Gio.UnixInputStream({ fd: stdout, close_fd: true });
-            // We need this one too, even if don't actually care of what the process
-            // has to say on stderr, because otherwise the fd opened by g_spawn_async_with_pipes
-            // is kept open indefinitely
-            let stderrStream = new Gio.UnixInputStream({ fd: stderr, close_fd: true });
-            stderrStream.close(null);
+            GLib.close(stderr);
             this._dataStdout = new Gio.DataInputStream({ base_stream: this._stdout });
 
             if (this._newStylePlugin)